From: Jasper St. Pierre Date: Wed, 11 May 2011 21:41:05 +0000 (-0400) Subject: workspace: Use Main.uiGroup instead of global.stage X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8263 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bc2b47974dfabfb7dbaa510f1362b0a28fd30af4;p=gnome-shell.git workspace: Use Main.uiGroup instead of global.stage The mouse-wheel zoom "easter egg" broke when using the magnifier because it was using global.stage. Fix it to use Main.uiGroup instead. https://bugzilla.gnome.org/show_bug.cgi?id=649632 --- diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 728eaa5f0..c06720db2 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -237,7 +237,7 @@ WindowClone.prototype = { this.emit('zoom-start'); if (!this._zoomLightbox) - this._zoomLightbox = new Lightbox.Lightbox(global.stage, + this._zoomLightbox = new Lightbox.Lightbox(Main.uiGroup, { fadeTime: LIGHTBOX_FADE_TIME }); this._zoomLightbox.show(); @@ -248,7 +248,7 @@ WindowClone.prototype = { this._zoomGlobalOrig.setPosition.apply(this._zoomGlobalOrig, this.actor.get_transformed_position()); this._zoomGlobalOrig.setScale(width / this.actor.width, height / this.actor.height); - this.actor.reparent(global.stage); + this.actor.reparent(Main.uiGroup); this._zoomLightbox.highlight(this.actor); [this.actor.x, this.actor.y] = this._zoomGlobalOrig.getPosition();